MMM, to be more thorough with the NFD example you'd need to separate the outcome for flush cards that pair the board. For example, if the board were Ks 9s 2d 3c and we had As7s IP facing a pot size bet with a pot size bet left on the river if we call, there would be the following outcomes:

1) non board pairing flush and he shoves or check calls and we always win (pot + turn bet + river bet)
2) board pairing flush and he shoves or check calls and we win (pot + turn bet + river bet)
3) board pairing flush and he shoves or check calls and we lose (turn bet + river bet)
4) any flush card and he check folds (we win pot + turn bet)
5) any blank (we lose turn bet)


And if you want to add a bluffing outcome

1) - 4) the same as above
5) blank we don't intend to bluff (we lose turn bet)
6) blank we intend to bluff, but he shoves first (we lose turn bet)
7) blank we intend to bluff, he check folds (we win pot + turn bet)
8) blank we intend to bluff, he check calls (we lose turn bet + river bet)